Revision: tlacontrib--ddaa--1.2--patch-21
Archive: ddaa@ddaa.net--2004
Creator: David Allouche <david@allouche.net>
Date: Thu Apr  1 19:29:40 CEST 2004
Standard-date: 2004-04-01 17:29:40 GMT
New-files: tlash/tlash.d/features
New-patches: ddaa@ddaa.net--2004/tlacontrib--ddaa--1.2--patch-21
Summary: merge-conflicts command

merge-conflict: try to perform a star-merge, reversing the given
revisions, and display the resulting conflicts.
